Refactoring var name