Better code (4/18)

Better code