Code clean-up and an easier, faster `tick'