Better code (18/18)

Better code