tidied up metadata and code