Bring code into line with style guidelines
Merge pull request #398 from timschofield/develop

Bring code into line with style guidelines