style fixes and improvements.