Refactor - Tidyup

Renamed variables to something clearer