Updated a bunch of style issues