Revert "tidy up"

This reverts commit 6db39014b3f22e5b1bb185af1565451840bab2bb.