Cleaned the code for passing Visual Studio 2005 build