Started using astyle and made some tweaks to formatting to keep check patch happy.