Cleaned up ambiguous for loop to avoid compiler warnings and code clarity
Merge branch 'feature/warningfix-ambiguous-for-loop' into merge-test

* feature/warningfix-ambiguous-for-loop:
  Cleaned up ambiguous for loop to avoid compiler warnings and code clarity