add refactoring as todo