Few nits and updated TODO.