code cleanup and artist management cleanup