Formatted and removed unused imports