Docs and drop silly m prefix from private variables

Change-Id: Ib2e5507e5735dd94423174f475e6a8e733f89fd7
Merge "Docs and drop silly m prefix from private variables"