Remove @logged decorator
Make compatibile with Python 3.2 by using f.__name__