Cleaning up experiment code