Revert "Code cleaning"

This reverts commit 82b7b12cce0414854c8bbe54f3dfb81e5a070b03.
Revert "Tweaking"

This reverts commit e50951a7a0346888d3a3225aec8e05d1fd9779b2.