code cleanup: improve variable names
small code cleanup