Refactor bonanaza