mini-mini-refactoring