More cleanup. Cosmetic changes.