Tidy up
Revert "Tidy up"

This reverts commit 250b47379cc93f029dd8ce74983b27ac587aca1a.
Tidy up