Tetchain Refactoring