move methods to module, refactoring