add todo
refactoring - rename.
remove unnecessary