Make a bit less shit

 - extract & improve timer
 - looks a bit nicer