fix TODOs
Merge pull request #4 from kikeda1104/feature/fix_TODO

fix TODOs