some cleaning and TODO.md