removed spaces in ordering
Merge branch 'scopes'