Code cleanup in ARTIST