Tidied up for public consumption