another brief refactoring