Misc. minor code cleanup
Merge branch 'master' into topic