Improve code, remove TODO
Cleanup