Better code (17/18)

Better code