Collapsed white space to at most one empty line between statements and declarations.
Switched to using factory creation methods in declarations for basic types.