Refactor to expressions