Minor changes before Pull Request