Better code (5/18)

Better code