refactor for fantasy land compliance
refactor for fantasy land compliance