Ran files through astyle. Changed things a bit much though.