Fix/refactor #16

Merged r-kuraoka merged 3 commits into nitta-lab-2021:master from nitta-lab-2021:fix/refactor on 9 Jun 2021