refactoring hPGe