Cosmetics

Just a cosmetics cleanup.