Better code (12/18)

Better code