Fixed variable names to be easier to read