Minor formatting changes for better MS Windows support