Fixed MOP formatting