removed debug messages, and some code cleaning