Code clean up.
Merge branch 'master' of https://github.com/klvh-mb/MB