lots of minor style changes