Removed unused imports, sanitize class names