var/syntax clean-up