Final style fixes