refactoring: using Each instead of loop
imports ordering