A tiny little bit of refactoring