Refactor players stuff to be a little cleaner.