Code cleanup, switched async to asyncMaybe to simplify
Merge pull request #687 from 7sharp9/cleanup

Code cleanup, switched async to asyncMaybe to simplify