Code Cleanup and added serever IP settings