There are way too many formatting changes here, which just adds noise. Please only submit relevant changes to the pull. Leave them here for this pull for now.