Simplified comments and function names.

Did some name changes and simplified comments; no functionality changes.