Reformat, cleanup