clean wrappers a bit