Fixing Formatting [Waiting]

This merge is purely style fixes, waiting for David to merge to prevent merge conflicts