Better extraction of stuff. cleanups