refactor AppleTV