General cleanup. Added Artifacts class to capture outputs.