cleaning

* a lot of code cleaning