Time control refactoring