refactoring and modularization