Revert "Cleaning all the code"

This reverts commit d11c161de774b5ea9e07c30dc878c1b761696de5.