Reformat to avoid multiple-assignment where it's unnecessary