Tame: More refactoring