only create wrapper when needed & code cleanup