Refactor - 2