Refactor mfa ranking by the method and not by source