Code optimization
Refactor file management