minor cleanup
minor style cleanup
more aesthetic cleanups
tweaks