Evaluation of the redesign of a STEM gatekeeper course, General Chemistry I, incorporating active-learning strategies and implementation of a student-choice model