Clean up class names and styles