Change code to fit with coding guidelines
Merge pull request #301 from timschofield/develop

Change code to fit with coding guidelines