Refactor1