clean up lazy initializations
Merge remote-tracking branch 'origin'
Streamline array creation