more Variable name changes for clarity