Massive tidy up
Small tidy up