Cleaned up class names