Refactoring Dicom Browser