Improve constant optimizer
Update TODO.md