Designer refactoring