Changed GetServerInfo to return dictionary + cleaned up code