modest refactoring