Refactor of row_presenter