Fixing whitespace to be up to spec.
Merged conflicts from #209 and #205.
Merge branch 'adamnovak-whitespace'.

This was a merge of conflicts between PR #209 and #205. Whitespace issues
now integrated with the namespacing of methods and models.