cleanup and add TODO