Extract method yet again