Cleanup & more wrappage