Made nrows optional arg pass for clean_up