Merge "Small documentation and stylistic changes."