eliminate local var, reformat