Unfuddle refactoring