Reformat and fix signature