More tidy-ups
Merge branch 'master' of https://github.com/Rammesses/ddd-octopus.git