Fix styling so it conforms to Caplin style guide.
Merge pull request #1068 from janhancic/misc/code-cleanup

Fix styling so it conforms to Caplin style guide