A little cleanup, slightly more efficient