Code cleanup, switched async to asyncMaybe to simplify