style fixes and tweaks