Small formatting and style fixes