More cleanup.
Small tweaks.
Even more cleanup.