[Talos] Refactoring