Tiny bit of refactoring