Revert "Tidying up"

This reverts commit 4e037e8bd2af432a3af07a2f8e525338e3005fe8.