improved methods about Time Mode, clean up, methods names,