Cleaned code.
Let Decorator support optional keyword arguments.