Small healthy refactoring