Code review feedback
- #2653