Refactoring in TimesItself