Further cleaning. `ollivier` function.