Better code (2/18)

Better code