Refactor var name