minor refactoring (variable name changes, etc)
minor refactoring (variable name changes, etc)