add TODO comment regarding refactoring