Clean up none-finder a little