Refactoring for modules usage