another set of refactoring