Fix indent
Improve behavior on Windows