Cleaned up DICOM code