Reformat, remove warnings.