continued refactoring HPGe