Better code (10/18)

Better code