cleaned up the code : fixed several glitches with the help of cpplint
Merge branch 'feature70' into dev
Cleaned up the code : fixed several glitches with the help of cpplint.