Doing a little house-cleaning
Merge branch 'code-cleanup'