Taki tam refactoring