review comments refactoring