Organizing

Further organizing question types styles.