Some Swift style fixes