variable name tweaks for readability