tidied up use of player object