Cleanup
Tweak sieve to make more efficient for large bases