Refactor Player and PlayerList functions