Improve code layout
Merge pull request #321 from timschofield/develop

Improve code layout