Refactoring and enhancement of rot0r control.
This will create a new commit in order to revert the existing changes.
