Make more comments more accurate and meet styling guide.