update var names for readability