Apply suggestions from code review
Co-authored-by: Vincent <vincentbusiness55@gmail.com> Co-authored-by: krittick <ben@krittick.net>