comments, docs and names improvement