- controller scope refactor