mini-refactoring