Better code (9/18)

Better code