Partial code tidy.
Merge remote branch 'origin/master'