Optimized duplicate directory name handling
Optimized log messages