Updating comments, code cleanup
added comments
Merge remote-tracking branch 'origin/master'
code cleanup