Better code (7/18)

Better code