cleaning up srv.js