Fix some incorrect keys in the data file
Use a more compact syntax for hours in the data file