Some minor changes before Pull Request.