Tighten up the wikipedia extract for loop

some nasty java -> scala conversion in here. it'd be great to get a json
library that supports Option type