update TODO to REFACTOR