refactor cukes