make some refactoring with importing modules