Revert "Tidy up"

This reverts commit 90891e1bd8ea42004744f71a56a5d9fe31a378aa.