Tidy up fire spreading