Improve formatting
Port to MSYS2 (Windows)