Refactor time!