Cleaning up and making Runs the central objects.