Revert "Code Cleaning."

This reverts commit 4c88f8aa3e291f475e962c5d65e280c8dd30bcc1.