variable name change & tweaks