Better way (16/31)

Better way