Few style fixes