Fixed a spurious warning, tweaked some variable names