Refactor Forge wizard