Tidy up properly

latest commit dd85dd6587
@mattmb authored