Better way (18/31)

Better way