Minor cleanup & comments
Merge pull request #1 from incubator/master

Minor cleanup & comments