minor variable tweaks