Some code cleaning
Some minor changes