updated v2 doc to reflect implementation
code cleanup