Edit made! I hope it's okay.