refactor variable naming