Code clean up and comment improvements.
Merge origin/master