Reformat and add version info