Some harmless refactoring