DE476 - Clean up and externalisation of strings