refactor time code
de-caffinate time spec