Removed unused imports
Fixed auto-formatted code to allow wider lines