Arnold modularity clean up.