Tidied up for public use