Refactoring mainly for global abatement purposes.