Improved some variables names and changed the keys in the  array.