Style fixes and improvements