Changed variables to be more readable