Tidied up various strings