Revert "Code cleaning"

This reverts commit 87940317b9502bf637734db7bc4fb21ef8fbc747.