merge
Inline documentation cleanup, and rename function