Various Cleanup

   Modified scoping in v10 calls
   Further Reorganized around return