リファクタ

Signed-off-by: okihara <okihara.masataka@dena.jp>