remove explicit -> () annotation and unwrapping of Option<()>