Fix/refactor #14

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