Added refactor comment