fix(comments) - clean the code and tests