Integrate edewit PR review comments
add TODO comment