More cleanup of variable names.