some changs for better C++ coding