Address comments
documentation