Refactoring against self