a little cleaning in the code.
This will create a new commit in order to revert the existing changes.
