Formatting, sorry for the clutter in the changes