Merge "Update doc comments and code formatting."