Code cleanup, and slip stream of code
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'