Better code (14/18)

Better code