[-] MO : Code optim

Some code optim