Extract methods from the extract method (no pun intended)

Signed-off-by: Igor Popov <igor.popov89@gmail.com>