Better code (16/18)

Better code