Revert "Tidy up"

This reverts commit b2faf827d7c6c2fb2cdd6f8c32033242bdc7b47d.