Cleaning CSS and renaming things