Now passes cpplint and some of the comments are clearer

Still needs some revisions.