Standards, white space and code alignment.
Merge pull request #3 from andytait/master

Standards, white space and code alignment.