minor refactor - sorted our variable names etc