Tidied up ready for publishing