Cosmetic changes

Cosmetic changes in order to have an unique coding style in all the project.