Addressed comments from review, added doc strings.