next comments refactorings