Bug865750: improved documentation and variable names per review