tidying up, refactors, new PortMappingEntry POPO