Improve script