cleaned up Artemis code