Fix formatting to match styleguide and jsbeautify and csscomb