Revert "Revert "Cleaning Code""

This reverts commit f3d8a5463f87091845e7dd51d7e1cd8ea0b653cd.