Tidy up tick handler