Refactoring player, moved variables to constructor