Tidied up ToString methods.