add todo for refactoring