Fixing a bunch of style bugs