Initial polish to TV #31