Introduce cols and rows instead of i and j, also restructure cluster grid