refactor time, baby