Rename and reorder

Delay getting a new row to when the data has been retrieved
Rename functions
Remove some obsolete lines