Eliminated unnecesary code for multiple choice