tiny bit of refactoring