Refactoring var names