Improve docs and removed incorrectly placed todo

Change-Id: Iabea2f4e65ff35648fe61b1f4217222fa59e49bc