Tech refactoring