Updated per suggestions from class mentor.