Minor improvements after discussing the Pull Request