Minor tweak
Clean up array references
Minor refactoring, tweak safeing behaivour
Touches are superceded by more recent modifications