modularizing refactoring