A little code and comment cleaning to improve readability.
Merge remote-tracking branch 'origin/master'