Fix incorrect comment and clean up initial select