fix lots of style issues