Extract method split in two