Update some comments and code consistency.