very minor refactoring