Make more idomatic