Cleanup
RowItem and recursive conversion with UnitTest's