Minor verbiage and variable naming fixes