Replaced teatime.
Minor refactoring.