Ordering refactor in the scoping implementation