Some cleanup of themo.py