General tidy-up of hard coded text and other stuff