clean up. Type inference is nifty