Finished cleaning up updateData (in Data.js)