Continue refactoring marginal effects