Minor fixes and formatting changes