Better classes and cleaning up css