Refactor 2nd