Formatting fixes, cleared white space.
Merge pull request #1 from andytait/master

Formatting fixes, cleared white space.