Fix a bunch of style issues