change url;
removed unused params;
code clean up