Refactored the TiraTime class