Change of generated variable names
Remove debug code