refactor using riddley lib