Refactor to express