Refactor to express intent