Revert "Tidy"

This reverts commit 7b1d2b4195910386b24251c5d8289d8cfe02b7a7.