refactor variable names
refactor variable names
more variable name refactoring