change for g++ clean code