Use const'ref, change if(foo) delete foo => delete foo not necessary to check it...

Use const'ref, change if(foo) delete foo => delete foo not necessary to check it, C++ does it for us

Add explicit keyword when necessary