Some minor cleanup of the deck picker directive to help pull out the picker logic of it