Matan has an aquarium in his room. One day he realizes that the number of goldfish he has is 5 less than twice the number of angelfish. If Matan has a total of 31 fish in his aquarium, how many of each type does he have?