Different return
Optimization of directories
Some more code optimization