Clean up imports
Documentation. Moved things around