add comments refactor