HomeHEPForge

More type cleanup