[-] MO : code optimization

Some code optim