Minor style and formatting changes