cosmetic and formatting changes