Style changes and improvements