Avoid clash with builtin file
Simplify files processing
Remove extra whitespace