renamed a few variables to be consistent and changed double quotes where no interpolation is used to single quotes