Some cleanup and added appropriately to VS project.