Refactoring - renamed a couple of variables.