Refactoring; Added usage to Player class