Removing some hard-coding of player data