Clean up multidimensional array usage
Merge conflicts