style and formatting changes