Array changes after review comment fixes