Revert "Codecleaning"

This reverts commit 1283517a6f946728d33c18217ea79199d2063d12.
Revert "Revert "Codecleaning""

This reverts commit 1b6757df735ea5ea76f8952d17c7f7fa3faf4f1d.