Made some simplifications.
Merge remote-tracking branch 'origin/master'
Minor comment change.