Also some typos and reformatting parts of the code Former-commit-id: 0f1de44fab44a09c49d08421a3c2032123d3023b Former-commit-id: 810b6b1bce1f7feeee7c33bec5ff16915367db17
Former-commit-id: 719e9ea62eafb45c238f551591567005f603190d
Former-commit-id: 8e264cdbc9e5290654c29e6893a121bce73c29c9