issue: code cleanup breaking up row attributes