Cleaned up some ugly hacks parsing hour Ids