refactor variable name
reformat code