First draft of clearning up Interaction.py (with a few tiny changes elsewhere).