Merge "Clean up spacing of doc comments"