refactoring and expanding on Trevor Live Show