Cleaned up the Quiz Class a little bit