Removed extract and replaced with something more sensible
a couple minor scrutinizer improvements