resolved: add more const
update TODO