CB-3736: Cleaning up code so that this makes more sense. Variables are OK