More refactroing to Player class