Cleanup and coment, + @TODO