refactor - 3