refactoring var names