Refactoring.
Missing include
Enhanced terms.