Refactor - 1