Cleaned up finder code duplication