moved Highlight into Choice. corrected code style.