Fix indentation from r197490 plus some typos