tidied up setupPlayer