Fix formatting issues, and code layout improvements to conform to coding guidelines
Merge pull request #271 from timschofield/develop

Fix formatting issues, and code layout improvements to conform to coding...