Updates based on pull request feedback
Updates based on code review feedback