Fix typo in variable name.
More cleanup.