Some code cleaning in modules/opp.py