Some code cleaning
Some code cleaning & simplification