Initial cleanup of experiment.py