Refactor player class

I've refactored Player class, please review