Cleaning the code.
Merge pull request #4137 from HassenRiahi/CleaningCode

Cleaning the code.