Small typo and point-free `return`
Merge branch 'topic/nami-doc-master'