Removed Matrix data structure in favor of arrays