[*] MO : Code refactoring