Refactor (removed List<T> rows)