Cleaned up Roster player parsing code