fixed a lot of style issues