Cleanup the Timer code
Issue Description : The timer code code is too complicated there's a lot of casting to current time and back to the actual timer length. We should clean the code and add the casting logic to theend points nd display of the timer and not every part of the code :)