Some code cleaning. All the comments things is not needed anymore.
Some refactoring and cleaning