Clean code

Some code cleaning