Added default values for "num_cols" and "num_rows" and reformatting