Metadata and reformat of code