Cleanup

Minor cleaning up and a revision to Memo’s gist.