Minor consistency updates
Merge pull request #21 from Coenego/consistency-update

Minor consistency updates