Tidied allTime code