Formatting changes and fixed a compilation issue between Windows and Linux.