Refactors some time disply functionality