Tidy up some code
Merge branch 'master' of https://github.com/orno/di