Code clean up Experiment 2