* 23w31a stuff i'm starting to get a headache so i'll stop now lots of stuff left though * Apply suggestions from code review Co-authored-by: YanisBft <yanis.briffaut@gmail.com> --------- Co-authored-by: YanisBft <yanis.briffaut@gmail.com>