Cleaned up some ChoiceView stuff