Reformat and improve version