Revert "Tidy everything."

This reverts commit 7a5a44b35221fbc4a91f3b5c3c6ea5f4c33d2dc8.