Refactored player to be inside of auth control.
Moved some scope properties inside of objects.