Revert "Code Cleaning"

This reverts commit 65b1d1224eb4de6ad0922139a07931b561762352.