fixup! Remove unecessary wraps
fixup! Switch to using a match statement. Move and update documentation.