More Swift style