time related refactoring;