style changes, mostly