Clean up qa model and variably weight percentages