Fix players order
Clean code