Review, fix some comments and indenting.