Refactor variables to be a little clearer