refactor FIOHourDataPoint -- clean up methods and fix broken stuff