Cleanup code to reduce use of Iterators, nested statements, etc
Cleanup code to reduce use of Iterators, nested statements, etc

erasche/Apollo,erasche/Apollo,erasche/Apollo,erasche/Apollo,erasche/Apollo