Code quality improved for pull 8700