Small code cleanup of EntertainmentAgent