Code

cleaner handling of DEFAULT_PORT