Improve: var handling