Re-organized time display functions