Some code cleaning in xhandler.py