[#86] Extract method