Agreed.  Since I modified/moved where the datastore keys were being populated, it's much clearer to state how you have done.