* 23w06a client * Apply suggestions from code review Co-authored-by: Shnupbups <shnupbups@gmail.com> --------- Co-authored-by: Shnupbups <shnupbups@gmail.com>