Formatting

Updated formatting of code to conform with coding standard. Closes #1.