Cleaned up imports
Moved some things around and cleaned up