add some fix (number in var name, token EOL...)