Fix bug in hour list
Extract class timer