fixed a lot of style