Cosmetic and formatting changes