formatting fixes, removing redundant code, regexp fix
formatting fixes, removing redundant code, regexp fix

Animatron/player,Animatron/player,bradparks/player,bradparks/player,RobertoUa/player,Animatron/player,RobertoUa/player