Proper wrapper, some clean up