row construction logic polishing