Refactor var names