Code cleanup + comments
Merge branch 'master' into bizo-2.10

* master:
  Code cleanup + comments