Reformat code, remove unnecessary arguments.