Fixed variable scoping
Updated syntax highlight