minor style changes and cleanup