Make more comments accurate and follow style guide.