Removed unused import
Cleanups and refactoring