Tiny Tiny bit of refactoring