Last set of consistency changes.
Merge pull request #3 from rtsuk/master

Last set of consistency changes.