refactor & formalize TODO