TTT refactor based on feedback