Cleaning up and adding some metadata