Lazy pull.
Some cleanup.