style fixes and improvements