Added own refactorings, and ntyper.