Oops, missed this, sorry for the extra commit. You're very right, variable names should not be misleading. :)