removed c++11 features from relevant c files
organized output