comments refactor