* Utils class
* minor refactorings
* notes