refactor variable names #2