initial refactoring of variable names