Code review

Signed-off-by: Ayoub Zayati <ayoub.ezzayati@exoplatform.com>