Refactoring and cleaning code
Organize imports