Extracted 2 methods