Better code (6/18)

Better code