Cleaned up Chosen handler