Tiny refactoring