Clean up code, commented, removed unused imports