Made changes based on code inspection conducted by Antoine.
Made changes based on code inspection conducted by Antoine.

nuagenetworks/monolithe,nuagenetworks/monolithe,little-dude/monolithe,little-dude/monolithe,nuagenetworks/monolithe,little-dude/monolithe