minor style changes / cleaning