Better code (11/18)

Better code