Changed GetServerInfo to return dictionary + cleaned up code

Changed GetServerInfo to return dictionary + cleaned up code.