Clean up
Clean up white spaces, fix build with VC15