Haxe 3 map syntax, changed some vars around