Formatting

Updated formatting of code to conform with coding standard. Closes #1.
Merge pull request #2 from toga98/Issue1

Formatting