cleaned up and combined CSS