Bug fixed.

* double choking.
Minor style.