One more small refactoring