Cleaning up CSS classes