Changed variables to names that make sense