Tiny refactoring changes