[FOLD] Break fee calculation out