refactoring time axis