Code cleanup to allow for adding more experiments.