Stop using extract() so much