Minor refactoring of rows