renamed variable for clarity; added () for clarity
merge fix