Changed data to row-data
reindentation
Removed console logs