Minor cleanup and refactoring.
Merge remote-tracking branch 'origin/master'