Tidied to publishable state