Added hyphens and made minor changes to variable names