re-run fix_code_style

cleaned up a bunch of formatting problems existent in master