Tidy up and refactor so indicies are array(row, col)