Organizes imports
Fixes compiler warnings