Cosmetics and code cleanup.