wip
Tidy up PortNudger