Cosmetic changes

In response to discussion about the pull request and comments by
Antonella Cascitelli.