Refactor 2