Standards fixes, alignment.
Merge pull request #1 from andytait/master

Standards fixes, alignment.