Minor cleaning
Minor refactor in total_preference_of
Minor refactor in total_preference_of