Minor cleanup on the twitch thing