Minor refactoring
Save port to file for lookup