minor refactoring
fix comment
renaming refactoring
adding todo
refactoring