Updates and improvements to styles and naming.