Refactoring, code cleanup
Reorganizing imports