clean up. parameterized.