Cleaned up with Ctrl+Shift+F and removed unused imports