Refactoring and bugfix DefibrillatorConverter