Started homogenising formatting
Merge pull request #11 from Goldmattress/patch-17

Started homogenising formatting