a whole bunch of style changes - sorry I should have committed more often