Minor changes.
Changes related to code style.