Better code (3/18)

Better code