#111 extracted methods