clean up overall wrapper design