TimeOColor refactoring with Abimbola Idowu