refactor time controllers