add TODO and improve comment style