refactor variable names