Optimization tweaks and a code cleanup.
Merge remote-tracking branch 'origin/master'