Small improvments
First great refactoring and evolution