small refactor module