Renamed matrix->width to matrix->lines and matrix->height to matrix->columns