Merge "Docs and drop silly m prefix from private variables"