Clean up class names and whitespace