Source Cleanup

Source cleaned up by changing many char* units to std::string datatypes.