Revert "Untidy stuff"

This reverts commit bc1c87ebcb53513af7e305b24b4cd5e002d97523.