block: row: refactor