Revert "Tidied up"

This reverts commit 786249f791a11901d954bb42ddee4d7503e1be90.
Tidied up