diff --git a/lib/src/generator.dart b/lib/src/generator.dart
index fea971b6c3..155bcca525 100644
--- a/lib/src/generator.dart
+++ b/lib/src/generator.dart
@@ -506,8 +506,8 @@ class HtmlGeneratorHelper extends Helper {
         buf.write(', ');
       }
       if (p.type != null && p.type.name != null) {
-        buf.write(createLinkedTypeName(p.type));
-        buf.write(' ');
+        String typeName = createLinkedTypeName(p.type);
+        if (typeName.isNotEmpty) buf.write('${typeName} ');
       }
       buf.write(p.name);
     }
diff --git a/lib/src/model.dart b/lib/src/model.dart
index bf7fbf4fb3..bfa2cf82d9 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -122,7 +122,7 @@ abstract class ModelElement {
       String retType = generator.createLinkedReturnTypeName(new ElementType(ex.type, library));
 
       return '${generator.createLinkedName(this)}'
-             '(${generator.printParams(ex.parameters.map((f)=>
+             '(${generator.printParams(ex.parameters.map((f) =>
                  new Parameter(f, library)))})'
              '${retType.isEmpty ? '' : ': $retType'}';
     }
@@ -149,7 +149,7 @@ abstract class ModelElement {
       }
 
       buf.write(generator.createLinkedReturnTypeName(new ElementType(e.type, library)));
-      buf.write(' ${e.name}(${generator.printParams(e.parameters.map((f)=> new Parameter(f, library)).toList())})');
+      buf.write(' ${e.name}(${generator.printParams(e.parameters.map((f) => new Parameter(f, library)).toList())})');
       return buf.toString();
     }
     if (isPropertyInducer) {
@@ -352,7 +352,7 @@ class ModelFunction extends ModelElement {
     String retType = generator.createLinkedReturnTypeName(new ElementType(_func.type, library));
 
     return '${generator.createLinkedName(this)}'
-           '(${generator.printParams(_func.parameters.map((f)=> new Parameter(f, library)))})'
+           '(${generator.printParams(_func.parameters.map((f) => new Parameter(f, library)))})'
            '${retType.isEmpty ? '' : ': $retType'}';
   }
 
@@ -362,7 +362,7 @@ class ModelFunction extends ModelElement {
       buf.write('static ');
     }
     buf.write(generator.createLinkedReturnTypeName(new ElementType(_func.type, library)));
-    buf.write(' ${_func.name}(${generator.printParams(_func.parameters.map((f)=> new Parameter(f, library)))})');
+    buf.write(' ${_func.name}(${generator.printParams(_func.parameters.map((f) => new Parameter(f, library)))})');
     return buf.toString();
   }
 }
@@ -389,7 +389,7 @@ class Typedef extends ModelElement {
       }
       buf.write('>');
     }
-    buf.write('(${generator.printParams(_typedef.parameters.map((f)=> new Parameter(f, library)))}): ');
+    buf.write('(${generator.printParams(_typedef.parameters.map((f) => new Parameter(f, library)))}): ');
     buf.write(generator.createLinkedReturnTypeName(new ElementType(_typedef.type, library)));
     return buf.toString();
   }
@@ -409,7 +409,7 @@ class Typedef extends ModelElement {
       }
       buf.write('>');
     }
-    buf.write('(${generator.printParams(_typedef.parameters.map((f)=> new Parameter(f, library)))}): ');
+    buf.write('(${generator.printParams(_typedef.parameters.map((f) => new Parameter(f, library)))}): ');
     return buf.toString();
   }
 
@@ -451,7 +451,7 @@ class Constructor extends ModelElement {
     buf.write('${_constructor.type.returnType.name}${_constructor.name.isEmpty?'':'.'}'
               '${_constructor.name}'
               '(${generator.printParams(
-                      _constructor.parameters.map((f)=> new Parameter(f, library)))})');
+                      _constructor.parameters.map((f) => new Parameter(f, library)))})');
     return buf.toString();
   }
 }
@@ -495,7 +495,7 @@ class Accessor extends ModelElement {
                 new ModelElement.from(_accessor.type.element, library))));
     } else {
       buf.write('${generator.createLinkedName(this)}('
-                '${generator.printParams(_accessor.parameters.map((f)=>
+                '${generator.printParams(_accessor.parameters.map((f) =>
                     new Parameter(f,library)))})');
     }
     return buf.toString();
@@ -509,7 +509,7 @@ class Accessor extends ModelElement {
     if (_accessor.isGetter) {
       buf.write('${generator.createLinkedReturnTypeName(new ElementType(_accessor.type, new ModelElement.from(_accessor.type.element, library)))} get ${_accessor.name}');
     } else {
-      buf.write('set ${_accessor.name}(${generator.printParams(_accessor.parameters.map((f)=> new Parameter(f,library)))})');
+      buf.write('set ${_accessor.name}(${generator.printParams(_accessor.parameters.map((f) => new Parameter(f,library)))})');
     }
     return buf.toString();
   }
@@ -533,10 +533,11 @@ class Parameter extends ModelElement {
 
   Parameter(ParameterElement element, Library library) : super(element, library);
 
-  ParameterElement get _parameter => (element as ParameterElement);
+  ParameterElement get _parameter => element as ParameterElement;
 
   ElementType get type => new ElementType(_parameter.type, library);
 
+  String toString() => element.name;
 }
 
 class ElementType {