Removed hard-coded port numbers, etc.