#683 Fix wording tips.
Follow coding standards.
Fix #754.