* Reformat and minor fixes