Exntentsions and refactoring.