modify variable names
refactor code