refactored away the Maybe stuff
shorter is possible…