Code cleaning
Removed unnecessary debug code
Changed some names