Clean stop method and various tidy-ups