Refactor wrappers and nullables