Making function documentation consistent
Going through function documentation, standardizing
Merge remote-tracking branch 'upstream/master'