changed a lot of the style stuff