refactore variable names