Fix Player constructor, minor refactoring