Additional formatting and style fixes