Thomas/stopit and tidyup