Remove useless lines
Fix TODO and improvements