Apply suggestions from code review

Co-authored-by: Elias <[email protected]>

Author: harley-kelly