Organized imports
Cleaned up code
Sorted members