Tidied up code that is produced by debug description