Slightly tweak structure and variable name.