Improved class and id naming, and reduced CSS