Consistency updates
Merge pull request #28 from Coenego/avocet-cleanup

Consistency updates