Refactoring, no effective change