clean up Analysis class