Addressed review feedback
- #2380