Made it cleaner, not working on populating actual quiz