Cleanup, change how random_choice works