more minor style changes