Remove TODO
Add comments