Refactoring HT-project