added new sorter method by water and by fat.
change 'if' for readble