Refactor number 2