Cosmetic changes and fix an omission