Address PR comments
Address PR comments

inokappa/documentation,jhotta/documentation,macobo/documentation,macobo/documentation,inokappa/documentation,jhotta/documentation,jhotta/documentation,jhotta/documentation,macobo/documentation,inokappa/documentation,inokappa/documentation,inokappa/documentation,macobo/documentation,jhotta/documentation,macobo/documentation,jhotta/documentation