Little bit of cleanup.
2X improvement in performance.