Revert "Revert "codeCleaning""

This reverts commit 26b88510b622a38ea8add3c7396c92cb36a5a0b8.