Minor style fixes and cleanup