Refactored two Artist handlers into one