Refactor 1/19