[#1778] Tidy up

:put_litter_in_its_place: