Initial cleaning

Cleaning up the spacing within some code to make it slightly easier to
see where brackets end/start.